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

diff --git a/libXfont/src/fontfile/bunzip2.c b/libXfont/src/fontfile/bunzip2.c
new file mode 100644
index 000000000..9964de6e9
--- /dev/null
+++ b/libXfont/src/fontfile/bunzip2.c
@@ -0,0 +1,179 @@
+/* Based on src/fontfile/gunzip.c
+   written by Mark Eichin <eichin@kitten.gen.ma.us> September 1996.
+   intended for inclusion in X11 public releases. */
+
+/* Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, and/or sell copies of the Software, and to permit persons
+ * to whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ *
+ * 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
+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
+ *
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale, use
+ * or other dealings in this Software without prior written authorization
+ * of the copyright holder.
+ */ 
+
+
+#include "config.h"
+
+#include <X11/fonts/fontmisc.h>
+#include <X11/fonts/bufio.h>
+#include <bzlib.h>
+
+typedef struct _xzip_buf {
+    bz_stream z;
+    int zstat;
+    BufChar b[BUFFILESIZE];
+    BufChar b_in[BUFFILESIZE];
+    BufFilePtr f;
+} xzip_buf;
+
+static int BufBzip2FileClose ( BufFilePtr f, int flag );
+static int BufBzip2FileFill ( BufFilePtr f );
+static int BufBzip2FileSkip ( BufFilePtr f, int c );
+
+_X_HIDDEN BufFilePtr
+BufFilePushBZIP2 (BufFilePtr f)
+{
+    xzip_buf *x;
+
+    x = (xzip_buf *) xalloc (sizeof (xzip_buf));
+    if (!x) return NULL;
+
+    bzero(&(x->z), sizeof(bz_stream));
+    x->f = f;
+
+    x->zstat = BZ2_bzDecompressInit(&(x->z),
+				    0,	/* verbosity: 0 silent, 4 max */
+				    0);	/* 0: go faster, 1: use less memory */
+    if (x->zstat != BZ_OK) {
+	xfree(x);
+	return NULL;
+    }
+
+    /* now that the history buffer is allocated, we provide the data buffer */
+    x->z.next_out = (char *) x->b;
+    x->z.avail_out = BUFFILESIZE;
+    x->z.next_in = (char *) x->b_in;
+    x->z.avail_in = 0;
+
+    return BufFileCreate((char *)x,
+			 BufBzip2FileFill,
+			 NULL,
+			 BufBzip2FileSkip,
+			 BufBzip2FileClose);
+}
+
+static int 
+BufBzip2FileClose(BufFilePtr f, int flag)
+{
+    xzip_buf *x = (xzip_buf *)f->private;
+    BZ2_bzDecompressEnd (&(x->z));
+    BufFileClose (x->f, flag);
+    xfree (x);
+    return 1;
+}
+
+/* here's the real work. 
+   -- we need to put stuff in f.buffer, update f.left and f.bufp,
+   then return the first byte (or BUFFILEEOF).
+   -- to do this, we need to get stuff into avail_in, and next_in, 
+   and call BZ2_bzDecompress appropriately.
+   -- we may also need to add CRC maintenance - if BZ2_bzDecompress tells us
+   BZ_STREAM_END, we then have 4bytes CRC and 4bytes length...
+*/
+static int 
+BufBzip2FileFill (BufFilePtr f)
+{
+    xzip_buf *x = (xzip_buf *)f->private;
+
+    /* we only get called when left == 0... */
+    /* but just in case, deal */
+    if (f->left >= 0) {
+	f->left--;
+	return *(f->bufp++);
+    }
+    /* did we run out last time? */
+    switch (x->zstat) {
+    case BZ_OK:
+	break;
+    case BZ_STREAM_END:
+    case BZ_DATA_ERROR:
+    case BZ_DATA_ERROR_MAGIC:
+	f->left = 0;
+	return BUFFILEEOF;
+    default:
+	return BUFFILEEOF;
+    }
+    /* now we work to consume what we can */
+    /* let libbz2 know what we can handle */
+    x->z.next_out = (char *) x->b;
+    x->z.avail_out = BUFFILESIZE;
+
+    /* and try to consume all of it */
+    while (x->z.avail_out > 0) {
+	/* if we don't have anything to work from... */
+	if (x->z.avail_in == 0) {
+	    /* ... fill the z buf from underlying file */
+	    int i, c;
+	    for (i = 0; i < sizeof(x->b_in); i++) {
+		c = BufFileGet(x->f);
+		if (c == BUFFILEEOF) break;
+		x->b_in[i] = c;
+	    }
+	    x->z.avail_in += i;
+	    x->z.next_in = (char *) x->b_in;
+	}
+	/* so now we have some output space and some input data */
+	x->zstat = BZ2_bzDecompress(&(x->z));
+	/* the inflation output happens in the f buffer directly... */
+	if (x->zstat == BZ_STREAM_END) {
+	    /* deal with EOF, crc */
+	    break;
+	}
+	if (x->zstat != BZ_OK) {
+	    break;
+	}
+    }
+    f->bufp = x->b;
+    f->left = BUFFILESIZE - x->z.avail_out;  
+
+    if (f->left >= 0) {
+	f->left--;
+	return *(f->bufp++);
+    } else {
+	return BUFFILEEOF;
+    }
+}
+
+/* there should be a BufCommonSkip... */
+static int 
+BufBzip2FileSkip (BufFilePtr f, int c)
+{
+    /* BufFileRawSkip returns the count unchanged.
+       BufCompressedSkip returns 0.
+       That means it probably never gets called... */
+    int retval = c;
+    while(c--) {
+	int get = BufFileGet(f);
+	if (get == BUFFILEEOF) return get;
+    }
+    return retval;
+}