dos -> unix

1 files changed, 90 insertions, 90 deletions

diff --git a/libXdmcp/Fill.c b/libXdmcp/Fill.c
index 2ff3cbbcc..98c324f45 100644
--- a/libXdmcp/Fill.c
+++ b/libXdmcp/Fill.c
@@ -1,90 +1,90 @@
-/*

-Copyright 1989, 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 WIN32

-#define _WILLWINSOCK_

-#endif

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include <X11/Xos.h>

-#include <X11/X.h>

-#include <X11/Xmd.h>

-#include <X11/Xdmcp.h>

-#include <stdlib.h>

-

-#ifdef STREAMSCONN

-#include <tiuser.h>

-#else

-#ifdef WIN32

-#include <X11/Xwinsock.h>

-#else

-#include <sys/socket.h>

-#endif

-#endif

-

-int

-XdmcpFill (int fd, XdmcpBufferPtr buffer, XdmcpNetaddr from, int *fromlen)

-{

-    BYTE    *newBuf;

-#ifdef STREAMSCONN

-    struct t_unitdata dataunit;

-    int gotallflag, result;

-#endif

-

-    if (buffer->size < XDM_MAX_MSGLEN)

-    {

-	newBuf = (BYTE *) malloc(XDM_MAX_MSGLEN);

-	if (newBuf)

-	{

-	    free(buffer->data);

-	    buffer->data = newBuf;

-	    buffer->size = XDM_MAX_MSGLEN;

-	}

-    }

-    buffer->pointer = 0;

-#ifdef STREAMSCONN

-    dataunit.addr.buf = from;

-    dataunit.addr.maxlen = *fromlen;

-    dataunit.opt.maxlen = 0;	/* don't care to know about options */

-    dataunit.udata.buf = (char *)buffer->data;

-    dataunit.udata.maxlen = buffer->size;

-    result = t_rcvudata (fd, &dataunit, &gotallflag);

-    if (result < 0) {

-	return FALSE;

-    }

-    buffer->count = dataunit.udata.len;

-    *fromlen = dataunit.addr.len;

-#else

-    buffer->count = recvfrom (fd, (char*)buffer->data, buffer->size, 0,

-			      (struct sockaddr *)from, (void *)fromlen);

-#endif

-    if (buffer->count < 6) {

-	buffer->count = 0;

-	return FALSE;

-    }

-    return TRUE;

-}

+/*
+Copyright 1989, 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 WIN32
+#define _WILLWINSOCK_
+#endif
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/Xos.h>
+#include <X11/X.h>
+#include <X11/Xmd.h>
+#include <X11/Xdmcp.h>
+#include <stdlib.h>
+
+#ifdef STREAMSCONN
+#include <tiuser.h>
+#else
+#ifdef WIN32
+#include <X11/Xwinsock.h>
+#else
+#include <sys/socket.h>
+#endif
+#endif
+
+int
+XdmcpFill (int fd, XdmcpBufferPtr buffer, XdmcpNetaddr from, int *fromlen)
+{
+    BYTE    *newBuf;
+#ifdef STREAMSCONN
+    struct t_unitdata dataunit;
+    int gotallflag, result;
+#endif
+
+    if (buffer->size < XDM_MAX_MSGLEN)
+    {
+	newBuf = (BYTE *) malloc(XDM_MAX_MSGLEN);
+	if (newBuf)
+	{
+	    free(buffer->data);
+	    buffer->data = newBuf;
+	    buffer->size = XDM_MAX_MSGLEN;
+	}
+    }
+    buffer->pointer = 0;
+#ifdef STREAMSCONN
+    dataunit.addr.buf = from;
+    dataunit.addr.maxlen = *fromlen;
+    dataunit.opt.maxlen = 0;	/* don't care to know about options */
+    dataunit.udata.buf = (char *)buffer->data;
+    dataunit.udata.maxlen = buffer->size;
+    result = t_rcvudata (fd, &dataunit, &gotallflag);
+    if (result < 0) {
+	return FALSE;
+    }
+    buffer->count = dataunit.udata.len;
+    *fromlen = dataunit.addr.len;
+#else
+    buffer->count = recvfrom (fd, (char*)buffer->data, buffer->size, 0,
+			      (struct sockaddr *)from, (void *)fromlen);
+#endif
+    if (buffer->count < 6) {
+	buffer->count = 0;
+	return FALSE;
+    }
+    return TRUE;
+}