svn merge ^/branches/released .

1 files changed, 91 insertions, 94 deletions

diff --git a/libXfont/src/fontfile/fileio.c b/libXfont/src/fontfile/fileio.c
index 3e2f98a2b..136087ca5 100644
--- a/libXfont/src/fontfile/fileio.c
+++ b/libXfont/src/fontfile/fileio.c
@@ -1,94 +1,91 @@
-/* $Xorg: fileio.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
-
-/*
-
-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.
-
-*/
-/* $XFree86: xc/lib/font/fontfile/fileio.c,v 3.9 2001/12/14 19:56:51 dawes Exp $ */
-
-/*
- * Author:  Keith Packard, MIT X Consortium
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <X11/fonts/fntfilio.h>
-#include <X11/Xos.h>
-#ifndef O_BINARY
-#define O_BINARY O_RDONLY
-#endif
-
-FontFilePtr
-FontFileOpen (const char *name)
-{
-    int		fd;
-    int		len;
-    BufFilePtr	raw, cooked;
-
-    fd = open (name, O_BINARY);
-    if (fd < 0)
-	return 0;
-    raw = BufFileOpenRead (fd);
-    if (!raw)
-    {
-	close (fd);
-	return 0;
-    }
-    len = strlen (name);
-    if (len > 2 && !strcmp (name + len - 2, ".Z")) {
-	cooked = BufFilePushCompressed (raw);
-	if (!cooked) {
-	    BufFileClose (raw, TRUE);
-	    return 0;
-	}
-	raw = cooked;
-#ifdef X_GZIP_FONT_COMPRESSION
-    } else if (len > 3 && !strcmp (name + len - 3, ".gz")) {
-	cooked = BufFilePushZIP (raw);
-	if (!cooked) {
-	    BufFileClose (raw, TRUE);
-	    return 0;
-	}
-	raw = cooked;
-#endif
-#ifdef X_BZIP2_FONT_COMPRESSION
-    } else if (len > 4 && !strcmp (name + len - 4, ".bz2")) {
-	cooked = BufFilePushBZIP2 (raw);
-	if (!cooked) {
-	    BufFileClose (raw, TRUE);
-	    return 0;
-	}
-	raw = cooked;
-#endif
-    }
-    return (FontFilePtr) raw;
-}
-
-int
-FontFileClose (FontFilePtr f)
-{
-    return BufFileClose ((BufFilePtr) f, TRUE);
-}
-
+/*

+

+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.

+

+*/

+

+/*

+ * Author:  Keith Packard, MIT X Consortium

+ */

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include <X11/fonts/fntfilio.h>

+#include <X11/Xos.h>

+#ifndef O_BINARY

+#define O_BINARY O_RDONLY

+#endif

+

+FontFilePtr

+FontFileOpen (const char *name)

+{

+    int		fd;

+    int		len;

+    BufFilePtr	raw, cooked;

+

+    fd = open (name, O_BINARY);

+    if (fd < 0)

+	return 0;

+    raw = BufFileOpenRead (fd);

+    if (!raw)

+    {

+	close (fd);

+	return 0;

+    }

+    len = strlen (name);

+    if (len > 2 && !strcmp (name + len - 2, ".Z")) {

+	cooked = BufFilePushCompressed (raw);

+	if (!cooked) {

+	    BufFileClose (raw, TRUE);

+	    return 0;

+	}

+	raw = cooked;

+#ifdef X_GZIP_FONT_COMPRESSION

+    } else if (len > 3 && !strcmp (name + len - 3, ".gz")) {

+	cooked = BufFilePushZIP (raw);

+	if (!cooked) {

+	    BufFileClose (raw, TRUE);

+	    return 0;

+	}

+	raw = cooked;

+#endif

+#ifdef X_BZIP2_FONT_COMPRESSION

+    } else if (len > 4 && !strcmp (name + len - 4, ".bz2")) {

+	cooked = BufFilePushBZIP2 (raw);

+	if (!cooked) {

+	    BufFileClose (raw, TRUE);

+	    return 0;

+	}

+	raw = cooked;

+#endif

+    }

+    return (FontFilePtr) raw;

+}

+

+int

+FontFileClose (FontFilePtr f)

+{

+    return BufFileClose ((BufFilePtr) f, TRUE);

+}

+