Module Name: xsrc
Committed By: mrg
Date: Sun Mar 11 10:08:03 UTC 2018
Modified Files:
xsrc/external/mit/xfs/dist/os: connection.c io.c xfstrans.c
xsrc/external/mit/xfs/include: config.h
Log Message:
merge xfs 1.2.0.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xfs/dist/os/connection.c \
xsrc/external/mit/xfs/dist/os/io.c \
xsrc/external/mit/xfs/dist/os/xfstrans.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xfs/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xfs/dist/os/connection.c
diff -u xsrc/external/mit/xfs/dist/os/connection.c:1.2 xsrc/external/mit/xfs/dist/os/connection.c:1.3
--- xsrc/external/mit/xfs/dist/os/connection.c:1.2 Fri Jul 17 17:38:55 2015
+++ xsrc/external/mit/xfs/dist/os/connection.c Sun Mar 11 10:08:03 2018
@@ -69,6 +69,7 @@ in this Software without prior written a
#include "config.h"
+/* include Xpoll.h early for possible FD_SETSIZE re-definition */
#include "X11/Xpoll.h"
#include <stdlib.h>
#include <X11/Xtrans/Xtrans.h>
Index: xsrc/external/mit/xfs/dist/os/io.c
diff -u xsrc/external/mit/xfs/dist/os/io.c:1.2 xsrc/external/mit/xfs/dist/os/io.c:1.3
--- xsrc/external/mit/xfs/dist/os/io.c:1.2 Sat Jul 18 06:03:20 2015
+++ xsrc/external/mit/xfs/dist/os/io.c Sun Mar 11 10:08:03 2018
@@ -50,6 +50,9 @@ in this Software without prior written a
#include "config.h"
+/* include Xpoll.h early for possible FD_SETSIZE re-definition */
+#include "X11/Xpoll.h"
+
#include <X11/Xtrans/Xtrans.h>
#include <stdio.h>
#include <errno.h>
Index: xsrc/external/mit/xfs/dist/os/xfstrans.c
diff -u xsrc/external/mit/xfs/dist/os/xfstrans.c:1.2 xsrc/external/mit/xfs/dist/os/xfstrans.c:1.3
--- xsrc/external/mit/xfs/dist/os/xfstrans.c:1.2 Wed Sep 21 22:11:16 2016
+++ xsrc/external/mit/xfs/dist/os/xfstrans.c Sun Mar 11 10:08:03 2018
@@ -30,12 +30,18 @@
#ifdef XFS_INETD
/* xfs special handling for listen socket passed from inetd */
-#include "misc.h"
+
+/* XXX duplicated from misc.h */
+typedef struct { /* when cloning, need old transport info */
+ int trans_id;
+ int fd;
+ int portnum;
+} OldListenRec;
OldListenRec *
TRANS(GetInetdListenInfo) (int fd)
{
- char *port = "0";
+ const char *port = "0";
XtransConnInfo inetdCI;
OldListenRec *old_listen;
int portnum;
@@ -79,10 +85,7 @@ TRANS(GetInetdListenInfo) (int fd)
#endif
if (listen (fd, BACKLOG) < 0)
- {
- FatalError("listen() failed on inetd socket: %s\n",
- strerror(errno));
- }
+ return NULL;
/* Pass the inetd socket back through the connection setup code
* the same way as a cloned listening port
Index: xsrc/external/mit/xfs/include/config.h
diff -u xsrc/external/mit/xfs/include/config.h:1.3 xsrc/external/mit/xfs/include/config.h:1.4
--- xsrc/external/mit/xfs/include/config.h:1.3 Thu Sep 22 15:50:17 2016
+++ xsrc/external/mit/xfs/include/config.h Sun Mar 11 10:08:03 2018
@@ -61,7 +61,7 @@
#define PACKAGE_NAME "xfs"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xfs 1.1.4"
+#define PACKAGE_STRING "xfs 1.2.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xfs"
@@ -70,16 +70,16 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.4"
+#define PACKAGE_VERSION "1.2.0"
/* Major version of this package */
#define PACKAGE_VERSION_MAJOR 1
/* Minor version of this package */
-#define PACKAGE_VERSION_MINOR 1
+#define PACKAGE_VERSION_MINOR 2
/* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 4
+#define PACKAGE_VERSION_PATCHLEVEL 0
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
@@ -116,7 +116,7 @@
/* Version number of package */
-#define VERSION "1.1.4"
+#define VERSION "1.2.0"
/* Build support for starting from inetd */
#define XFS_INETD 1
