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, 8 insertions, 3 deletions

diff --git a/libXaw/src/MultiSrc.c b/libXaw/src/MultiSrc.c
index 148a17889..efa08b081 100644
--- a/libXaw/src/MultiSrc.c
+++ b/libXaw/src/MultiSrc.c
@@ -1092,15 +1092,18 @@ static Bool
 WriteToFile(String string, String name)
 {
     int fd;
+    Bool result = True;
 
-    if (((fd = creat(name, 0666)) == -1)
-	|| (write(fd, string, strlen(string)) == -1))
+    if ((fd = creat(name, 0666)) == -1)
 	return (False);
 
+    if (write(fd, string, strlen(string)) == -1)
+        result = False;
+
     if (close(fd) == -1)
 	return (False);
 
-    return (True);
+    return (result);
 }
 
 
@@ -1260,6 +1263,8 @@ InitStringOrFile(MultiSrcObject src, Bool newString)
 		src->multi_src.length = (XawTextPosition)ftell(file);
 		return(file);
 	    }
+	    else
+		close(fd);
 	}
 	{
 	    String params[2];