Merge remote-tracking branch 'origin/released'

* origin/released:
  Update following packages:

Conflicts:
	X11/Xwinsock.h
	apps/xhost/xhost.c
	libXaw/src/Vendor.c
	libXfont/include/X11/fonts/bdfint.h
	libXfont/src/fontfile/catalogue.c

1 files changed, 22 insertions, 18 deletions

diff --git a/libXfont/src/fontfile/catalogue.c b/libXfont/src/fontfile/catalogue.c
index 5ce8a0799..75eb4e3a3 100644..100755
--- a/libXfont/src/fontfile/catalogue.c
+++ b/libXfont/src/fontfile/catalogue.c
@@ -28,6 +28,8 @@
 #include <config.h>
 #endif
 #include <X11/Xwindows.h>
+
+#ifdef HAVE_READLINK
 #include <X11/fonts/fntfilst.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -61,7 +63,7 @@ CatalogueAddFPE (CataloguePtr cat, FontPathElementPtr fpe)
 	    cat->fpeAlloc = 16;
 	else
 	    cat->fpeAlloc *= 2;
-	
+
 	new = realloc(cat->fpeList, cat->fpeAlloc * sizeof(FontPathElementPtr));
 	if (new == NULL)
 	    return AllocError;
@@ -192,7 +194,7 @@ CatalogueRescan (FontPathElementPtr fpe, Bool forceScan)
 	subfpe->type = fpe->type;
 	subfpe->name_length = len;
 	subfpe->name = malloc (len + 1);
-	if (subfpe == NULL)
+	if (subfpe->name == NULL)
 	{
 	    free(subfpe);
 	    continue;
@@ -254,7 +256,7 @@ static int
 CatalogueResetFPE (FontPathElementPtr fpe)
 {
     /* Always just tell the caller to close and re-open */
-    return FPEResetFailed;	
+    return FPEResetFailed;
 }
 
 static int
@@ -280,10 +282,10 @@ CatalogueFreeFPE (FontPathElementPtr fpe)
 }
 
 static int
-CatalogueOpenFont (pointer client, FontPathElementPtr fpe, Mask flags, 
-		   char *name, int namelen, 
+CatalogueOpenFont (pointer client, FontPathElementPtr fpe, Mask flags,
+		   char *name, int namelen,
 		   fsBitmapFormat format, fsBitmapFormatMask fmask,
-		   XID id, FontPtr *pFont, char **aliasName, 
+		   XID id, FontPtr *pFont, char **aliasName,
 		   FontPtr non_cachable_font)
 {
     CataloguePtr cat = fpe->private;
@@ -303,7 +305,7 @@ CatalogueOpenFont (pointer client, FontPathElementPtr fpe, Mask flags,
 	if (status == Successful || status == FontNameAlias)
 	    return status;
     }
-	    
+
     return BadFontName;
 }
 
@@ -317,7 +319,7 @@ CatalogueCloseFont (FontPathElementPtr fpe, FontPtr pFont)
 }
 
 static int
-CatalogueListFonts (pointer client, FontPathElementPtr fpe, char *pat, 
+CatalogueListFonts (pointer client, FontPathElementPtr fpe, char *pat,
 		    int len, int max, FontNamesPtr names)
 {
     CataloguePtr cat = fpe->private;
@@ -338,8 +340,8 @@ CatalogueListFonts (pointer client, FontPathElementPtr fpe, char *pat,
 }
 
 int
-FontFileStartListFonts(pointer client, FontPathElementPtr fpe, 
-		       char *pat, int len, int max, 
+FontFileStartListFonts(pointer client, FontPathElementPtr fpe,
+		       char *pat, int len, int max,
 		       pointer *privatep, int mark_aliases);
 
 typedef struct _LFWIData {
@@ -348,7 +350,7 @@ typedef struct _LFWIData {
 } LFWIDataRec, *LFWIDataPtr;
 
 static int
-CatalogueStartListFonts(pointer client, FontPathElementPtr fpe, 
+CatalogueStartListFonts(pointer client, FontPathElementPtr fpe,
 			char *pat, int len, int max, pointer *privatep,
 			int mark_aliases)
 {
@@ -384,16 +386,16 @@ CatalogueStartListFonts(pointer client, FontPathElementPtr fpe,
 }
 
 static int
-CatalogueStartListFontsWithInfo(pointer client, FontPathElementPtr fpe, 
-				char *pat, int len, int max, 
+CatalogueStartListFontsWithInfo(pointer client, FontPathElementPtr fpe,
+				char *pat, int len, int max,
 				pointer *privatep)
 {
     return CatalogueStartListFonts(client, fpe, pat, len, max, privatep, 0);
 }
 
 static int
-CatalogueListNextFontWithInfo(pointer client, FontPathElementPtr fpe, 
-			      char **namep, int *namelenp, 
+CatalogueListNextFontWithInfo(pointer client, FontPathElementPtr fpe,
+			      char **namep, int *namelenp,
 			      FontInfoPtr *pFontInfo,
 			      int *numFonts, pointer private)
 {
@@ -422,15 +424,15 @@ CatalogueListNextFontWithInfo(pointer client, FontPathElementPtr fpe,
 }
 
 static int
-CatalogueStartListFontsAndAliases(pointer client, FontPathElementPtr fpe, 
-				  char *pat, int len, int max, 
+CatalogueStartListFontsAndAliases(pointer client, FontPathElementPtr fpe,
+				  char *pat, int len, int max,
 				  pointer *privatep)
 {
     return CatalogueStartListFonts(client, fpe, pat, len, max, privatep, 1);
 }
 
 static int
-CatalogueListNextFontOrAlias(pointer client, FontPathElementPtr fpe, 
+CatalogueListNextFontOrAlias(pointer client, FontPathElementPtr fpe,
 			     char **namep, int *namelenp, char **resolvedp,
 			     int *resolvedlenp, pointer private)
 {
@@ -477,3 +479,5 @@ CatalogueRegisterLocalFpeFunctions (void)
 			 CatalogueListNextFontOrAlias,
 			 FontFileEmptyBitmapSource);
 }
+
+#endif /* HAVE_READLINK */