svn merge ^/branches/released .

3 files changed, 529 insertions, 524 deletions

diff --git a/libX11/src/FSWrap.c b/libX11/src/FSWrap.c
index a94709365..c9c3867c1 100644
--- a/libX11/src/FSWrap.c
+++ b/libX11/src/FSWrap.c
@@ -1,263 +1,263 @@
-
-/*
- * Copyright 1991 by the Open Software Foundation
- * Copyright 1993 by the TOSHIBA Corp.
- *
- * 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 Open Software Foundation
- * not be used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  Open Software
- * Foundation makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without express or
- * implied warranty.
- *
- * OPEN SOFTWARE FOUNDATION DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL OPEN SOFTWARE FOUNDATIONN 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.
- *
- *		 M. Collins		OSF
- *
- *		 Katsuhisa Yano		TOSHIBA Corp.
- */
-
-/*
-
-Copyright 1991, 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.
-
-*/
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "Xlibint.h"
-#include "Xlcint.h"
-#include <ctype.h>
-#include <X11/Xos.h>
-
-
-#define	XMAXLIST	256
-
-char **
-_XParseBaseFontNameList(
-    char           *str,
-    int            *num)
-{
-    char           *plist[XMAXLIST];
-    char          **list;
-    char           *ptr, *psave;
-
-    *num = 0;
-    if (!str || !*str) {
-	return (char **)NULL;
-    }
-    while (*str && isspace(*str))
-	str++;
-    if (!*str)
-	return (char **)NULL;
-
-    if (!(ptr = Xmalloc((unsigned)strlen(str) + 1))) {
-	return (char **)NULL;
-    }
-    strcpy(ptr, str);
-
-    psave = ptr;
-    /* somebody who specifies more than XMAXLIST basefontnames will lose */
-    while (*num < (sizeof plist / sizeof plist[0])) {
-	char	*back;
-
-	plist[*num] = ptr;
-	if ((ptr = strchr(ptr, ','))) {
-	    back = ptr;
-	} else {
-	    back = plist[*num] + strlen(plist[*num]);
-	}
-	while (isspace(*(back - 1)))
-	    back--;
-	*back = '\0';
-	(*num)++;
-	if (!ptr)
-	    break;
-	ptr++;
-	while (*ptr && isspace(*ptr))
-	    ptr++;
-	if (!*ptr)
-	    break;
-    }
-    if (!(list = (char **) Xmalloc((unsigned)sizeof(char *) * (*num + 1)))) {
-	Xfree(psave);
-	return (char **)NULL;
-    }
-    memcpy((char *)list, (char *)plist, sizeof(char *) * (*num));
-    *(list + *num) = NULL;
-
-    return list;
-}
-
-static char **
-copy_string_list(
-    char **string_list,
-    int list_count)
-{
-    char **string_list_ret, **list_src, **list_dst, *dst;
-    int length, count;
-
-    if (string_list == NULL)
-	return (char **) NULL;
-
-    string_list_ret = (char **) Xmalloc(sizeof(char *) * list_count);
-    if (string_list_ret == NULL)
-	return (char **) NULL;
-
-    list_src = string_list;
-    count = list_count;
-    for (length = 0; count-- > 0; list_src++)
-	length += strlen(*list_src) + 1;
-
-    dst = (char *) Xmalloc(length);
-    if (dst == NULL) {
-	Xfree(string_list_ret);
-	return (char **) NULL;
-    }
-
-    list_src = string_list;
-    count = list_count;
-    list_dst = string_list_ret;
-    for ( ;  count-- > 0; list_src++) {
-	strcpy(dst, *list_src);
-	*list_dst++ = dst;
-	dst += strlen(dst) + 1;
-    }
-
-    return string_list_ret;
-}
-
-XFontSet
-XCreateFontSet (
-    Display        *dpy,
-    _Xconst char   *base_font_name_list,
-    char         ***missing_charset_list,
-    int            *missing_charset_count,
-    char          **def_string)
-{
-    XOM om;
-    XOC oc;
-    XOMCharSetList *list;
-
-    *missing_charset_list = NULL;
-    *missing_charset_count = 0;
-
-    om = XOpenOM(dpy, NULL, NULL, NULL);
-    if (om == NULL)
-	return (XFontSet) NULL;
-
-    if ((oc = XCreateOC(om, XNBaseFontName, base_font_name_list, NULL))) {
-	list = &oc->core.missing_list;
-	oc->core.om_automatic = True;
-    } else
-	list = &om->core.required_charset;
-
-    *missing_charset_list = copy_string_list(list->charset_list,
-					     list->charset_count);
-    *missing_charset_count = list->charset_count;
-
-    if (list->charset_list && *missing_charset_list == NULL)
-	oc = NULL;
-
-    if (oc && def_string) {
-	*def_string = oc->core.default_string;
-	if (!*def_string)
-	    *def_string = "";
-    }
-
-    if (oc == NULL)
-	XCloseOM(om);
-
-    return (XFontSet) oc;
-}
-
-int
-XFontsOfFontSet(
-    XFontSet        font_set,
-    XFontStruct  ***font_struct_list,
-    char         ***font_name_list)
-{
-    *font_name_list   = font_set->core.font_info.font_name_list;
-    *font_struct_list = font_set->core.font_info.font_struct_list;
-    return font_set->core.font_info.num_font;
-}
-
-char *
-XBaseFontNameListOfFontSet(XFontSet font_set)
-{
-    return font_set->core.base_name_list;
-}
-
-char *
-XLocaleOfFontSet(XFontSet font_set)
-{
-    return font_set->core.om->core.lcd->core->name;
-}
-
-Bool
-XContextDependentDrawing(XFontSet font_set)
-{
-    return font_set->core.om->core.context_dependent;
-}
-
-Bool
-XDirectionalDependentDrawing(XFontSet font_set)
-{
-    return font_set->core.om->core.directional_dependent;
-}
-
-Bool
-XContextualDrawing(XFontSet font_set)
-{
-    return font_set->core.om->core.contextual_drawing;
-}
-
-XFontSetExtents *
-XExtentsOfFontSet(XFontSet font_set)
-{
-    if (!font_set)
-	return NULL;
-    return &font_set->core.font_set_extents;
-}
-
-void
-XFreeFontSet(
-    Display        *dpy,
-    XFontSet        font_set)
-{
-    XCloseOM(font_set->core.om);
-}
+

+/*

+ * Copyright 1991 by the Open Software Foundation

+ * Copyright 1993 by the TOSHIBA Corp.

+ *

+ * 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 Open Software Foundation

+ * not be used in advertising or publicity pertaining to distribution of the

+ * software without specific, written prior permission.  Open Software

+ * Foundation makes no representations about the suitability of this

+ * software for any purpose.  It is provided "as is" without express or

+ * implied warranty.

+ *

+ * OPEN SOFTWARE FOUNDATION DISCLAIMS ALL WARRANTIES WITH REGARD TO

+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+ * FITNESS, IN NO EVENT SHALL OPEN SOFTWARE FOUNDATIONN 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.

+ *

+ *		 M. Collins		OSF

+ *

+ *		 Katsuhisa Yano		TOSHIBA Corp.

+ */

+

+/*

+

+Copyright 1991, 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.

+

+*/

+

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include "Xlibint.h"

+#include "Xlcint.h"

+#include <ctype.h>

+#include <X11/Xos.h>

+

+

+#define	XMAXLIST	256

+

+char **

+_XParseBaseFontNameList(

+    char           *str,

+    int            *num)

+{

+    char           *plist[XMAXLIST];

+    char          **list;

+    char           *ptr, *psave;

+

+    *num = 0;

+    if (!str || !*str) {

+	return (char **)NULL;

+    }

+    while (*str && isspace(*str))

+	str++;

+    if (!*str)

+	return (char **)NULL;

+

+    if (!(ptr = Xmalloc((unsigned)strlen(str) + 1))) {

+	return (char **)NULL;

+    }

+    strcpy(ptr, str);

+

+    psave = ptr;

+    /* somebody who specifies more than XMAXLIST basefontnames will lose */

+    while (*num < (sizeof plist / sizeof plist[0])) {

+	char	*back;

+

+	plist[*num] = ptr;

+	if ((ptr = strchr(ptr, ','))) {

+	    back = ptr;

+	} else {

+	    back = plist[*num] + strlen(plist[*num]);

+	}

+	while (isspace(*(back - 1)))

+	    back--;

+	*back = '\0';

+	(*num)++;

+	if (!ptr)

+	    break;

+	ptr++;

+	while (*ptr && isspace(*ptr))

+	    ptr++;

+	if (!*ptr)

+	    break;

+    }

+    if (!(list = (char **) Xmalloc((unsigned)sizeof(char *) * (*num + 1)))) {

+	Xfree(psave);

+	return (char **)NULL;

+    }

+    memcpy((char *)list, (char *)plist, sizeof(char *) * (*num));

+    *(list + *num) = NULL;

+

+    return list;

+}

+

+static char **

+copy_string_list(

+    char **string_list,

+    int list_count)

+{

+    char **string_list_ret, **list_src, **list_dst, *dst;

+    int length, count;

+

+    if (string_list == NULL || list_count == 0)

+	return (char **) NULL;

+

+    string_list_ret = (char **) Xmalloc(sizeof(char *) * list_count);

+    if (string_list_ret == NULL)

+	return (char **) NULL;

+

+    list_src = string_list;

+    count = list_count;

+    for (length = 0; count-- > 0; list_src++)

+	length += strlen(*list_src) + 1;

+

+    dst = (char *) Xmalloc(length);

+    if (dst == NULL) {

+	Xfree(string_list_ret);

+	return (char **) NULL;

+    }

+

+    list_src = string_list;

+    count = list_count;

+    list_dst = string_list_ret;

+    for ( ;  count-- > 0; list_src++) {

+	strcpy(dst, *list_src);

+	*list_dst++ = dst;

+	dst += strlen(dst) + 1;

+    }

+

+    return string_list_ret;

+}

+

+XFontSet

+XCreateFontSet (

+    Display        *dpy,

+    _Xconst char   *base_font_name_list,

+    char         ***missing_charset_list,

+    int            *missing_charset_count,

+    char          **def_string)

+{

+    XOM om;

+    XOC oc;

+    XOMCharSetList *list;

+

+    *missing_charset_list = NULL;

+    *missing_charset_count = 0;

+

+    om = XOpenOM(dpy, NULL, NULL, NULL);

+    if (om == NULL)

+	return (XFontSet) NULL;

+

+    if ((oc = XCreateOC(om, XNBaseFontName, base_font_name_list, NULL))) {

+	list = &oc->core.missing_list;

+	oc->core.om_automatic = True;

+    } else

+	list = &om->core.required_charset;

+

+    *missing_charset_list = copy_string_list(list->charset_list,

+					     list->charset_count);

+    *missing_charset_count = list->charset_count;

+

+    if (list->charset_list && *missing_charset_list == NULL)

+	oc = NULL;

+

+    if (oc && def_string) {

+	*def_string = oc->core.default_string;

+	if (!*def_string)

+	    *def_string = "";

+    }

+

+    if (oc == NULL)

+	XCloseOM(om);

+

+    return (XFontSet) oc;

+}

+

+int

+XFontsOfFontSet(

+    XFontSet        font_set,

+    XFontStruct  ***font_struct_list,

+    char         ***font_name_list)

+{

+    *font_name_list   = font_set->core.font_info.font_name_list;

+    *font_struct_list = font_set->core.font_info.font_struct_list;

+    return font_set->core.font_info.num_font;

+}

+

+char *

+XBaseFontNameListOfFontSet(XFontSet font_set)

+{

+    return font_set->core.base_name_list;

+}

+

+char *

+XLocaleOfFontSet(XFontSet font_set)

+{

+    return font_set->core.om->core.lcd->core->name;

+}

+

+Bool

+XContextDependentDrawing(XFontSet font_set)

+{

+    return font_set->core.om->core.context_dependent;

+}

+

+Bool

+XDirectionalDependentDrawing(XFontSet font_set)

+{

+    return font_set->core.om->core.directional_dependent;

+}

+

+Bool

+XContextualDrawing(XFontSet font_set)

+{

+    return font_set->core.om->core.contextual_drawing;

+}

+

+XFontSetExtents *

+XExtentsOfFontSet(XFontSet font_set)

+{

+    if (!font_set)

+	return NULL;

+    return &font_set->core.font_set_extents;

+}

+

+void

+XFreeFontSet(

+    Display        *dpy,

+    XFontSet        font_set)

+{

+    XCloseOM(font_set->core.om);

+}

diff --git a/libX11/src/RdBitF.c b/libX11/src/RdBitF.c
index e9a509c55..6b920c609 100644
--- a/libX11/src/RdBitF.c
+++ b/libX11/src/RdBitF.c
@@ -1,257 +1,262 @@
-/*
-
-Copyright 1987, 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.
-
-*/
-
-/*
- *	Code to read bitmaps from disk files. Interprets
- *	data from X10 and X11 bitmap files and creates
- *	Pixmap representations of files. Returns Pixmap
- *	ID and specifics about image.
- *
- *	Modified for speedup by Jim Becker, changed image
- *	data parsing logic (removed some fscanf()s).
- *	Aug 5, 1988
- *
- * Note that this file and ../Xmu/RdBitF.c look very similar....  Keep them
- * that way (but don't use common source code so that people can have one
- * without the other).
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "Xlibint.h"
-#include <X11/Xos.h>
-#include "Xutil.h"
-#include <stdio.h>
-#include <ctype.h>
-
-
-#define MAX_SIZE 255
-
-/* shared data for the image read/parse logic */
-static const signed char hexTable[256] = {
-    0,  0,  0,  0,  0,  0,  0,  0,  0, -1, -1,  0,  0,  0,  0,  0
-  , 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
-  ,-1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, -1,  0,  0,  0
-  , 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  0,  0,  0,  0,  0,  0
-  , 0, 10, 11, 12, 13, 14, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0
-  , 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
-  , 0, 10, 11, 12, 13, 14, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0
-  , 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, -1,  0,  0
-  , 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
-  , 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
-  , 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
-  , 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
-  , 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
-  , 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
-  , 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
-  , 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
-};
-
-/*
- *	read next hex value in the input stream, return -1 if EOF
- */
-static int
-NextInt (
-    FILE *fstream)
-{
-    int	ch;
-    int	value = 0;
-    int gotone = 0;
-    int done = 0;
-
-    /* loop, accumulate hex value until find delimiter  */
-    /* skip any initial delimiters found in read stream */
-
-    while (!done) {
-	ch = getc(fstream);
-	if (ch == EOF) {
-	    value	= -1;
-	    done++;
-	} else {
-	    /* trim high bits, check type and accumulate */
-	    ch &= 0xff;
-	    if (isascii(ch) && isxdigit(ch)) {
-		value = (value << 4) + hexTable[ch];
-		gotone++;
-	    } else if ((hexTable[ch]) < 0 && gotone)
-	      done++;
-	}
-    }
-    return value;
-}
-
-int
-XReadBitmapFileData (
-    _Xconst char *filename,
-    unsigned int *width,                /* RETURNED */
-    unsigned int *height,               /* RETURNED */
-    unsigned char **data,               /* RETURNED */
-    int *x_hot,                         /* RETURNED */
-    int *y_hot)                         /* RETURNED */
-{
-    FILE *fstream;			/* handle on file  */
-    unsigned char *bits = NULL;		/* working variable */
-    char line[MAX_SIZE];		/* input line from file */
-    int size;				/* number of bytes of data */
-    char name_and_type[MAX_SIZE];	/* an input line */
-    char *type;				/* for parsing */
-    int value;				/* from an input line */
-    int version10p;			/* boolean, old format */
-    int padding;			/* to handle alignment */
-    int bytes_per_line;			/* per scanline of data */
-    unsigned int ww = 0;		/* width */
-    unsigned int hh = 0;		/* height */
-    int hx = -1;			/* x hotspot */
-    int hy = -1;			/* y hotspot */
-
-#ifdef __UNIXOS2__
-    filename = __XOS2RedirRoot(filename);
-#endif
-    if (!(fstream = fopen(filename, "r")))
-	return BitmapOpenFailed;
-
-    /* error cleanup and return macro	*/
-#define	RETURN(code) \
-{ if (bits) Xfree ((char *)bits); fclose (fstream); return code; }
-
-    while (fgets(line, MAX_SIZE, fstream)) {
-	if (strlen(line) == MAX_SIZE-1)
-	    RETURN (BitmapFileInvalid);
-	if (sscanf(line,"#define %s %d",name_and_type,&value) == 2) {
-	    if (!(type = strrchr(name_and_type, '_')))
-	      type = name_and_type;
-	    else
-	      type++;
-
-	    if (!strcmp("width", type))
-	      ww = (unsigned int) value;
-	    if (!strcmp("height", type))
-	      hh = (unsigned int) value;
-	    if (!strcmp("hot", type)) {
-		if (type-- == name_and_type || type-- == name_and_type)
-		  continue;
-		if (!strcmp("x_hot", type))
-		  hx = value;
-		if (!strcmp("y_hot", type))
-		  hy = value;
-	    }
-	    continue;
-	}
-
-	if (sscanf(line, "static short %s = {", name_and_type) == 1)
-	  version10p = 1;
-	else if (sscanf(line,"static unsigned char %s = {",name_and_type) == 1)
-	  version10p = 0;
-	else if (sscanf(line, "static char %s = {", name_and_type) == 1)
-	  version10p = 0;
-	else
-	  continue;
-
-	if (!(type = strrchr(name_and_type, '_')))
-	  type = name_and_type;
-	else
-	  type++;
-
-	if (strcmp("bits[]", type))
-	  continue;
-
-	if (!ww || !hh)
-	  RETURN (BitmapFileInvalid);
-
-	if ((ww % 16) && ((ww % 16) < 9) && version10p)
-	  padding = 1;
-	else
-	  padding = 0;
-
-	bytes_per_line = (ww+7)/8 + padding;
-
-	size = bytes_per_line * hh;
-	bits = (unsigned char *) Xmalloc ((unsigned int) size);
-	if (!bits)
-	  RETURN (BitmapNoMemory);
-
-	if (version10p) {
-	    unsigned char *ptr;
-	    int bytes;
-
-	    for (bytes=0, ptr=bits; bytes<size; (bytes += 2)) {
-		if ((value = NextInt(fstream)) < 0)
-		  RETURN (BitmapFileInvalid);
-		*(ptr++) = value;
-		if (!padding || ((bytes+2) % bytes_per_line))
-		  *(ptr++) = value >> 8;
-	    }
-	} else {
-	    unsigned char *ptr;
-	    int bytes;
-
-	    for (bytes=0, ptr=bits; bytes<size; bytes++, ptr++) {
-		if ((value = NextInt(fstream)) < 0)
-		  RETURN (BitmapFileInvalid);
-		*ptr=value;
-	    }
-	}
-    }					/* end while */
-
-    fclose(fstream);
-    if (!bits)
-	return (BitmapFileInvalid);
-
-    *data = bits;
-    *width = ww;
-    *height = hh;
-    if (x_hot) *x_hot = hx;
-    if (y_hot) *y_hot = hy;
-
-    return (BitmapSuccess);
-}
-
-int
-XReadBitmapFile (
-    Display *display,
-    Drawable d,
-    _Xconst char *filename,
-    unsigned int *width,                /* RETURNED */
-    unsigned int *height,               /* RETURNED */
-    Pixmap *pixmap,                     /* RETURNED */
-    int *x_hot,                         /* RETURNED */
-    int *y_hot)                         /* RETURNED */
-{
-    unsigned char *data;
-    int res;
-
-    res = XReadBitmapFileData(filename, width, height, &data, x_hot, y_hot);
-    if (res != BitmapSuccess)
-	return res;
-    *pixmap = XCreateBitmapFromData(display, d, (char *)data, *width, *height);
-    Xfree((char *)data);
-    if (*pixmap == None)
-	return (BitmapNoMemory);
-    return (BitmapSuccess);
-}
+/*

+

+Copyright 1987, 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.

+

+*/

+

+/*

+ *	Code to read bitmaps from disk files. Interprets

+ *	data from X10 and X11 bitmap files and creates

+ *	Pixmap representations of files. Returns Pixmap

+ *	ID and specifics about image.

+ *

+ *	Modified for speedup by Jim Becker, changed image

+ *	data parsing logic (removed some fscanf()s).

+ *	Aug 5, 1988

+ *

+ * Note that this file and ../Xmu/RdBitF.c look very similar....  Keep them

+ * that way (but don't use common source code so that people can have one

+ * without the other).

+ */

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include "Xlibint.h"

+#include <X11/Xos.h>

+#include "Xutil.h"

+#include <stdio.h>

+#include <ctype.h>

+

+

+#define MAX_SIZE 255

+

+/* shared data for the image read/parse logic */

+static const signed char hexTable[256] = {

+    0,  0,  0,  0,  0,  0,  0,  0,  0, -1, -1,  0,  0,  0,  0,  0

+  , 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0

+  ,-1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, -1,  0,  0,  0

+  , 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  0,  0,  0,  0,  0,  0

+  , 0, 10, 11, 12, 13, 14, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0

+  , 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0

+  , 0, 10, 11, 12, 13, 14, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0

+  , 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, -1,  0,  0

+  , 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0

+  , 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0

+  , 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0

+  , 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0

+  , 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0

+  , 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0

+  , 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0

+  , 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0

+};

+

+/*

+ *	read next hex value in the input stream, return -1 if EOF

+ */

+static int

+NextInt (

+    FILE *fstream)

+{

+    int	ch;

+    int	value = 0;

+    int gotone = 0;

+    int done = 0;

+

+    /* loop, accumulate hex value until find delimiter  */

+    /* skip any initial delimiters found in read stream */

+

+    while (!done) {

+	ch = getc(fstream);

+	if (ch == EOF) {

+	    value	= -1;

+	    done++;

+	} else {

+	    /* trim high bits, check type and accumulate */

+	    ch &= 0xff;

+	    if (isascii(ch) && isxdigit(ch)) {

+		value = (value << 4) + hexTable[ch];

+		gotone++;

+	    } else if ((hexTable[ch]) < 0 && gotone)

+	      done++;

+	}

+    }

+    return value;

+}

+

+int

+XReadBitmapFileData (

+    _Xconst char *filename,

+    unsigned int *width,                /* RETURNED */

+    unsigned int *height,               /* RETURNED */

+    unsigned char **data,               /* RETURNED */

+    int *x_hot,                         /* RETURNED */

+    int *y_hot)                         /* RETURNED */

+{

+    FILE *fstream;			/* handle on file  */

+    unsigned char *bits = NULL;		/* working variable */

+    char line[MAX_SIZE];		/* input line from file */

+    int size;				/* number of bytes of data */

+    char name_and_type[MAX_SIZE];	/* an input line */

+    char *type;				/* for parsing */

+    int value;				/* from an input line */

+    int version10p;			/* boolean, old format */

+    int padding;			/* to handle alignment */

+    int bytes_per_line;			/* per scanline of data */

+    unsigned int ww = 0;		/* width */

+    unsigned int hh = 0;		/* height */

+    int hx = -1;			/* x hotspot */

+    int hy = -1;			/* y hotspot */

+

+#ifdef __UNIXOS2__

+    filename = __XOS2RedirRoot(filename);

+#endif

+    if (!(fstream = fopen(filename, "r")))

+	return BitmapOpenFailed;

+

+    /* error cleanup and return macro	*/

+#define	RETURN(code) \

+{ if (bits) Xfree ((char *)bits); fclose (fstream); return code; }

+

+    while (fgets(line, MAX_SIZE, fstream)) {

+	if (strlen(line) == MAX_SIZE-1)

+	    RETURN (BitmapFileInvalid);

+	if (sscanf(line,"#define %s %d",name_and_type,&value) == 2) {

+	    if (!(type = strrchr(name_and_type, '_')))

+	      type = name_and_type;

+	    else

+	      type++;

+

+	    if (!strcmp("width", type))

+	      ww = (unsigned int) value;

+	    if (!strcmp("height", type))

+	      hh = (unsigned int) value;

+	    if (!strcmp("hot", type)) {

+		if (type-- == name_and_type || type-- == name_and_type)

+		  continue;

+		if (!strcmp("x_hot", type))

+		  hx = value;

+		if (!strcmp("y_hot", type))

+		  hy = value;

+	    }

+	    continue;

+	}

+

+	if (sscanf(line, "static short %s = {", name_and_type) == 1)

+	  version10p = 1;

+	else if (sscanf(line,"static unsigned char %s = {",name_and_type) == 1)

+	  version10p = 0;

+	else if (sscanf(line, "static char %s = {", name_and_type) == 1)

+	  version10p = 0;

+	else

+	  continue;

+

+	if (!(type = strrchr(name_and_type, '_')))

+	  type = name_and_type;

+	else

+	  type++;

+

+	if (strcmp("bits[]", type))

+	  continue;

+

+	if (!ww || !hh)

+	  RETURN (BitmapFileInvalid);

+

+	if ((ww % 16) && ((ww % 16) < 9) && version10p)

+	  padding = 1;

+	else

+	  padding = 0;

+

+	bytes_per_line = (ww+7)/8 + padding;

+

+	size = bytes_per_line * hh;

+	bits = (unsigned char *) Xmalloc ((unsigned int) size);

+	if (!bits)

+	  RETURN (BitmapNoMemory);

+

+	if (version10p) {

+	    unsigned char *ptr;

+	    int bytes;

+

+	    for (bytes=0, ptr=bits; bytes<size; (bytes += 2)) {

+		if ((value = NextInt(fstream)) < 0)

+		  RETURN (BitmapFileInvalid);

+		*(ptr++) = value;

+		if (!padding || ((bytes+2) % bytes_per_line))

+		  *(ptr++) = value >> 8;

+	    }

+	} else {

+	    unsigned char *ptr;

+	    int bytes;

+

+	    for (bytes=0, ptr=bits; bytes<size; bytes++, ptr++) {

+		if ((value = NextInt(fstream)) < 0)

+		  RETURN (BitmapFileInvalid);

+		*ptr=value;

+	    }

+	}

+

+	/* If we got to this point, we read a full bitmap file. Break so we don't

+	 * start reading another one from the same file and leak the memory

+	 * allocated for the previous one. */

+	break;

+    }					/* end while */

+

+    fclose(fstream);

+    if (!bits)

+	return (BitmapFileInvalid);

+

+    *data = bits;

+    *width = ww;

+    *height = hh;

+    if (x_hot) *x_hot = hx;

+    if (y_hot) *y_hot = hy;

+

+    return (BitmapSuccess);

+}

+

+int

+XReadBitmapFile (

+    Display *display,

+    Drawable d,

+    _Xconst char *filename,

+    unsigned int *width,                /* RETURNED */

+    unsigned int *height,               /* RETURNED */

+    Pixmap *pixmap,                     /* RETURNED */

+    int *x_hot,                         /* RETURNED */

+    int *y_hot)                         /* RETURNED */

+{

+    unsigned char *data;

+    int res;

+

+    res = XReadBitmapFileData(filename, width, height, &data, x_hot, y_hot);

+    if (res != BitmapSuccess)

+	return res;

+    *pixmap = XCreateBitmapFromData(display, d, (char *)data, *width, *height);

+    Xfree((char *)data);

+    if (*pixmap == None)

+	return (BitmapNoMemory);

+    return (BitmapSuccess);

+}

diff --git a/libX11/src/xcms/LRGB.c b/libX11/src/xcms/LRGB.c
index 8f1394b7f..2dc5a20cf 100644
--- a/libX11/src/xcms/LRGB.c
+++ b/libX11/src/xcms/LRGB.c
@@ -653,7 +653,7 @@ LINEAR_RGB_InitSCCData(
 	     */

 	    if (!(pScreenData = (LINEAR_RGB_SCCData *)

 			      Xcalloc (1, sizeof(LINEAR_RGB_SCCData)))) {

-		return(XcmsFailure);

+		goto Free_property_return;

 	    }

 	    /* copy matrices */

 	    memcpy((char *)pScreenData, (char *)pScreenDefaultData,

@@ -663,7 +663,7 @@ LINEAR_RGB_InitSCCData(
 	    if (!(pNewMap = (XcmsIntensityMap *)

 			      Xcalloc (1, sizeof(XcmsIntensityMap)))) {

 		Xfree((char *)pScreenData);

-		return(XcmsFailure);

+		goto Free_property_return;

 	    }

 	    pNewMap->visualID = visualID;

 	    pNewMap->screenData = (XPointer)pScreenData;

@@ -802,7 +802,7 @@ FreeBlueTbl:
     Xfree((char *)pScreenData->pBlueTbl);

 

 FreeGreenTblElements:

-    Xfree((char *)pScreenData->pBlueTbl->pBase);

+    Xfree((char *)pScreenData->pGreenTbl->pBase);

 

 FreeGreenTbl:

     Xfree((char *)pScreenData->pGreenTbl);

@@ -817,7 +817,7 @@ Free_property_return:
     Xfree ((char *)property_return);

 

 FreeSCCData:

-    Xfree((char *)pScreenData);

+    Xfree((char *)pScreenDefaultData);

     pPerScrnInfo->state = XcmsInitNone;

     return(XcmsFailure);

 }