merge XFree86 4.3.0.1 to -CURRENT

parent ee452992
...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/ICElib.h,v 3.4 2001/12/14 19:53:35 dawes Exp $ */
#ifndef _ICELIB_H_ #ifndef _ICELIB_H_
#define _ICELIB_H_ #define _ICELIB_H_
......
...@@ -26,12 +26,17 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,12 +26,17 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/ICEmsg.h,v 1.4 2001/12/20 19:40:59 tsi Exp $ */
#ifndef _ICEMSG_H_ #ifndef _ICEMSG_H_
#define _ICEMSG_H_ #define _ICEMSG_H_
#include <X11/Xfuncproto.h>
#include <X11/ICE/ICEconn.h> #include <X11/ICE/ICEconn.h>
_XFUNCPROTOBEGIN
/* /*
* Function prototypes for internal ICElib functions * Function prototypes for internal ICElib functions
*/ */
...@@ -299,4 +304,6 @@ extern void _IceErrorBadValue ( ...@@ -299,4 +304,6 @@ extern void _IceErrorBadValue (
_IceRead (_iceConn, (unsigned long) (_bytes), _dummy); \ _IceRead (_iceConn, (unsigned long) (_bytes), _dummy); \
} }
_XFUNCPROTOEND
#endif /* _ICEMSG_H_ */ #endif /* _ICEMSG_H_ */
...@@ -26,13 +26,18 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,13 +26,18 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/ICEutil.h,v 1.4 2001/12/20 19:40:59 tsi Exp $ */
#ifndef _ICEUTIL_H_ #ifndef _ICEUTIL_H_
#define _ICEUTIL_H_ #define _ICEUTIL_H_
#include <X11/Xfuncproto.h>
#include <stdio.h> #include <stdio.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
_XFUNCPROTOBEGIN
/* /*
* Data structure for entry in ICE authority file * Data structure for entry in ICE authority file
*/ */
...@@ -135,4 +140,6 @@ extern void IceSetPaAuthData ( ...@@ -135,4 +140,6 @@ extern void IceSetPaAuthData (
#endif #endif
); );
_XFUNCPROTOEND
#endif /* _ICEUTIL_H_ */ #endif /* _ICEUTIL_H_ */
...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/ICElibint.h,v 1.6 2001/12/14 19:53:35 dawes Exp $ */
#ifndef _ICELIBINT_H_ #ifndef _ICELIBINT_H_
#define _ICELIBINT_H_ #define _ICELIBINT_H_
...@@ -37,15 +38,8 @@ Author: Ralph Mor, X Consortium ...@@ -37,15 +38,8 @@ Author: Ralph Mor, X Consortium
#include <X11/ICE/ICEconn.h> #include <X11/ICE/ICEconn.h>
#include <X11/ICE/ICEmsg.h> #include <X11/ICE/ICEmsg.h>
#ifndef X_NOT_STDC_ENV
#include <stdlib.h> #include <stdlib.h>
#else #include <stddef.h>
char *malloc();
#endif
#ifndef NULL
#define NULL 0
#endif
/* /*
...@@ -287,20 +281,21 @@ typedef struct { ...@@ -287,20 +281,21 @@ typedef struct {
} }
#define SKIP_STRING(_pBuf, _swap) \ #define SKIP_STRING(_pBuf, _swap, _end, _bail) \
{ \ { \
CARD16 _len; \ CARD16 _len; \
EXTRACT_CARD16 (_pBuf, _swap, _len); \ EXTRACT_CARD16 (_pBuf, _swap, _len); \
_pBuf += _len; \ _pBuf += _len + PAD32(2+_len); \
if (PAD32 (2 + _len)) \ if (_pBuf > _end) { \
_pBuf += PAD32 (2 + _len); \ _bail; \
} } \
}
#define SKIP_LISTOF_STRING(_pBuf, _swap, _count) \ #define SKIP_LISTOF_STRING(_pBuf, _swap, _count, _end, _bail) \
{ \ { \
int _i; \ int _i; \
for (_i = 0; _i < _count; _i++) \ for (_i = 0; _i < _count; _i++) \
SKIP_STRING (_pBuf, _swap); \ SKIP_STRING (_pBuf, _swap, _end, _bail); \
} }
......
...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/authutil.c,v 3.9 2002/05/31 18:45:41 dawes Exp $ */
#include <X11/ICE/ICElib.h> #include <X11/ICE/ICElib.h>
#include "ICElibint.h" #include "ICElibint.h"
...@@ -34,14 +35,11 @@ Author: Ralph Mor, X Consortium ...@@ -34,14 +35,11 @@ Author: Ralph Mor, X Consortium
#include <sys/stat.h> #include <sys/stat.h>
#include <errno.h> #include <errno.h>
#ifdef X_NOT_STDC_ENV
extern int errno;
extern long time ();
extern char *getenv();
#define Time_t long
#else
#include <time.h> #include <time.h>
#define Time_t time_t #define Time_t time_t
#ifdef __UNIXOS2__
extern char* getenv(const char*);
#define link rename
#endif #endif
#ifndef X_NOT_POSIX #ifndef X_NOT_POSIX
#include <unistd.h> #include <unistd.h>
...@@ -77,7 +75,7 @@ IceAuthFileName () ...@@ -77,7 +75,7 @@ IceAuthFileName ()
static char *buf; static char *buf;
static int bsize; static int bsize;
int size; int size;
#ifdef WIN32 #if defined(WIN32) || defined(__UNIXOS2__)
#ifndef PATH_MAX #ifndef PATH_MAX
#define PATH_MAX 512 #define PATH_MAX 512
#endif #endif
...@@ -108,6 +106,11 @@ IceAuthFileName () ...@@ -108,6 +106,11 @@ IceAuthFileName ()
name = dir; name = dir;
} }
if (!name) if (!name)
#endif
#ifdef __UNIXOS2__
strcpy (dir,"c:");
name = dir;
if (!name)
#endif #endif
return (NULL); return (NULL);
} }
......
...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/connect.c,v 3.10 2002/12/02 21:50:29 tsi Exp $ */
#include <X11/ICE/ICElib.h> #include <X11/ICE/ICElib.h>
#include "ICElibint.h" #include "ICElibint.h"
...@@ -34,23 +35,7 @@ Author: Ralph Mor, X Consortium ...@@ -34,23 +35,7 @@ Author: Ralph Mor, X Consortium
static XtransConnInfo ConnectToPeer(); static XtransConnInfo ConnectToPeer();
#ifndef X_NOT_STDC_ENV
#define Strstr strstr #define Strstr strstr
#else
static char *Strstr(s1, s2)
char *s1, *s2;
{
int n1, n2;
n1 = strlen(s1);
n2 = strlen(s2);
for ( ; n1 >= n2; s1++, n1--) {
if (!strncmp(s1, s2, n2))
return s1;
}
return NULL;
}
#endif
IceConn IceConn
IceOpenConnection (networkIdsList, context, mustAuthenticate, majorOpcodeCheck, IceOpenConnection (networkIdsList, context, mustAuthenticate, majorOpcodeCheck,
...@@ -220,7 +205,7 @@ char *errorStringRet; ...@@ -220,7 +205,7 @@ char *errorStringRet;
iceConn->inbufmax = iceConn->inbuf + ICE_INBUFSIZE; iceConn->inbufmax = iceConn->inbuf + ICE_INBUFSIZE;
if ((iceConn->outbuf = iceConn->outbufptr = if ((iceConn->outbuf = iceConn->outbufptr =
(char *) malloc (ICE_OUTBUFSIZE)) == NULL) (char *) calloc (1, ICE_OUTBUFSIZE)) == NULL)
{ {
_IceFreeConnection (iceConn); _IceFreeConnection (iceConn);
strncpy (errorStringRet, "Can't malloc", errorLength); strncpy (errorStringRet, "Can't malloc", errorLength);
...@@ -473,6 +458,7 @@ char **actualConnectionRet; ...@@ -473,6 +458,7 @@ char **actualConnectionRet;
int madeConnection = 0; int madeConnection = 0;
int len, retry; int len, retry;
int connect_stat; int connect_stat;
int address_size;
XtransConnInfo trans_conn = NULL; XtransConnInfo trans_conn = NULL;
*actualConnectionRet = NULL; *actualConnectionRet = NULL;
...@@ -481,8 +467,16 @@ char **actualConnectionRet; ...@@ -481,8 +467,16 @@ char **actualConnectionRet;
len = strlen (networkIdsList); len = strlen (networkIdsList);
endptr = networkIdsList + len; endptr = networkIdsList + len;
if (len < sizeof addrbuf) address = addrbuf; if (len < sizeof addrbuf)
else address = malloc (len + 1); {
address = addrbuf;
address_size = 256;
}
else
{
address = malloc (len + 1);
address_size = len;
}
while (ptr < endptr && !madeConnection) while (ptr < endptr && !madeConnection)
{ {
...@@ -490,6 +484,8 @@ char **actualConnectionRet; ...@@ -490,6 +484,8 @@ char **actualConnectionRet;
delim = endptr; delim = endptr;
len = delim - ptr; len = delim - ptr;
if (len > address_size - 1)
len = address_size - 1;
strncpy (address, ptr, len); strncpy (address, ptr, len);
address[len] = '\0'; address[len] = '\0';
......
...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/error.c,v 1.6 2001/12/14 19:53:35 dawes Exp $ */
#include <X11/ICE/ICElib.h> #include <X11/ICE/ICElib.h>
#include "ICElibint.h" #include "ICElibint.h"
...@@ -33,10 +34,6 @@ Author: Ralph Mor, X Consortium ...@@ -33,10 +34,6 @@ Author: Ralph Mor, X Consortium
#include <errno.h> #include <errno.h>
#ifdef X_NOT_STDC_ENV
extern int errno;
#endif
void void
_IceErrorBadMinor (iceConn, majorOpcode, offendingMinor, severity) _IceErrorBadMinor (iceConn, majorOpcode, offendingMinor, severity)
...@@ -428,7 +425,7 @@ IcePointer values; ...@@ -428,7 +425,7 @@ IcePointer values;
fprintf (stderr, "ICE error: Offending minor opcode = %d (%s)\n", fprintf (stderr, "ICE error: Offending minor opcode = %d (%s)\n",
offendingMinorOpcode, str); offendingMinorOpcode, str);
fprintf (stderr, " Offending sequence number = %d\n", fprintf (stderr, " Offending sequence number = %lu\n",
offendingSequence); offendingSequence);
switch (errorClass) switch (errorClass)
...@@ -609,8 +606,8 @@ IceConn iceConn; ...@@ -609,8 +606,8 @@ IceConn iceConn;
{ {
fprintf (stderr, fprintf (stderr,
"ICE default IO error handler doing an exit(), pid = %d, errno = %d\n", "ICE default IO error handler doing an exit(), pid = %ld, errno = %d\n",
getpid(), errno); (long)getpid(), errno);
exit (1); exit (1);
} }
......
...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/getauth.c,v 1.3 2001/12/14 19:53:35 dawes Exp $ */
#include <X11/ICE/ICElib.h> #include <X11/ICE/ICElib.h>
#include "ICElibint.h" #include "ICElibint.h"
...@@ -98,7 +99,7 @@ unsigned short *authDataLenRet; ...@@ -98,7 +99,7 @@ unsigned short *authDataLenRet;
char **authDataRet; char **authDataRet;
{ {
IceAuthDataEntry *entry; IceAuthDataEntry *entry = NULL;
int found = 0; int found = 0;
int i; int i;
......
...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/globals.h,v 1.5 2002/05/31 18:45:41 dawes Exp $ */
extern void _IceDefaultErrorHandler (); extern void _IceDefaultErrorHandler ();
extern void _IceDefaultIOErrorHandler (); extern void _IceDefaultIOErrorHandler ();
...@@ -35,11 +36,17 @@ extern IcePaAuthStatus _IcePaMagicCookie1Proc (); ...@@ -35,11 +36,17 @@ extern IcePaAuthStatus _IcePaMagicCookie1Proc ();
extern void _IceProcessCoreMessage (); extern void _IceProcessCoreMessage ();
#ifndef __UNIXOS2__
IceConn _IceConnectionObjs[256]; IceConn _IceConnectionObjs[256];
char *_IceConnectionStrings[256]; char *_IceConnectionStrings[256];
_IceProtocol _IceProtocols[255];
#else
IceConn _IceConnectionObjs[256] = {0};
char *_IceConnectionStrings[256] = {0};
_IceProtocol _IceProtocols[255] = {0};
#endif
int _IceConnectionCount = 0; int _IceConnectionCount = 0;
_IceProtocol _IceProtocols[255];
int _IceLastMajorOpcode = 0; int _IceLastMajorOpcode = 0;
int _IceAuthCount = 1; int _IceAuthCount = 1;
......
...@@ -26,18 +26,14 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,18 +26,14 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/iceauth.c,v 3.6 2002/05/31 18:45:41 dawes Exp $ */
#include <X11/ICE/ICElib.h> #include <X11/ICE/ICElib.h>
#include "ICElibint.h" #include "ICElibint.h"
#include <X11/ICE/ICEutil.h> #include <X11/ICE/ICEutil.h>
#ifdef X_NOT_STDC_ENV
#define Time_t long
extern Time_t time ();
#else
#include <time.h> #include <time.h>
#define Time_t time_t #define Time_t time_t
#endif
static int binaryEqual (); static int binaryEqual ();
...@@ -73,8 +69,9 @@ int len; ...@@ -73,8 +69,9 @@ int len;
} }
#else #else
{ {
#ifndef __UNIXOS2__
long time (); long time ();
#endif
ldata[0] = time ((long *) 0); ldata[0] = time ((long *) 0);
ldata[1] = getpid (); ldata[1] = getpid ();
} }
......
...@@ -25,6 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings ...@@ -25,6 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group. in this Software without prior written authorization from The Open Group.
*/ */
/* $XFree86: xc/lib/ICE/listenwk.c,v 1.4 2001/12/14 19:53:36 dawes Exp $ */
/* Author: Ralph Mor, X Consortium */ /* Author: Ralph Mor, X Consortium */
......
...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/misc.c,v 1.4 2001/12/14 19:53:36 dawes Exp $ */
#ifdef WIN32 #ifdef WIN32
#define _WILLWINSOCK_ #define _WILLWINSOCK_
...@@ -69,8 +70,9 @@ unsigned long size; ...@@ -69,8 +70,9 @@ unsigned long size;
* Output/Input buffer functions * Output/Input buffer functions
*/ */
int
IceFlush (iceConn) IceFlush (iceConn)
IceConn iceConn; IceConn iceConn;
{ {
......
This diff is collapsed.
...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/protosetup.c,v 1.3 2001/12/14 19:53:36 dawes Exp $ */
#include <X11/ICE/ICElib.h> #include <X11/ICE/ICElib.h>
#include "ICElibint.h" #include "ICElibint.h"
...@@ -58,7 +59,7 @@ char *errorStringRet; ...@@ -58,7 +59,7 @@ char *errorStringRet;
unsigned long setup_sequence; unsigned long setup_sequence;
IceReplyWaitInfo replyWait; IceReplyWaitInfo replyWait;
_IceReply reply; _IceReply reply;
IcePoVersionRec *versionRec; IcePoVersionRec *versionRec = NULL;
int authCount; int authCount;
int *authIndices; int *authIndices;
......
...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/setauth.c,v 1.5 2002/05/31 18:45:41 dawes Exp $ */
#include <X11/ICE/ICElib.h> #include <X11/ICE/ICElib.h>
#include "ICElibint.h" #include "ICElibint.h"
...@@ -48,7 +49,11 @@ Author: Ralph Mor, X Consortium ...@@ -48,7 +49,11 @@ Author: Ralph Mor, X Consortium
*/ */
int _IcePaAuthDataEntryCount = 0; int _IcePaAuthDataEntryCount = 0;
#ifndef __UNIXOS2__
IceAuthDataEntry _IcePaAuthDataEntries[ICE_MAX_AUTH_DATA_ENTRIES]; IceAuthDataEntry _IcePaAuthDataEntries[ICE_MAX_AUTH_DATA_ENTRIES];
#else
IceAuthDataEntry _IcePaAuthDataEntries[ICE_MAX_AUTH_DATA_ENTRIES] = {0};
#endif
void void
......
...@@ -26,9 +26,11 @@ in this Software without prior written authorization from The Open Group. ...@@ -26,9 +26,11 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium Author: Ralph Mor, X Consortium
******************************************************************************/ ******************************************************************************/
/* $XFree86: xc/lib/ICE/shutdown.c,v 3.4 2001/12/14 19:53:36 dawes Exp $ */
#include <X11/ICE/ICElib.h> #include <X11/ICE/ICElib.h>
#include "ICElibint.h" #include "ICElibint.h"
#include <X11/Xtrans.h>
Status Status
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment