SwallowOS/xorg_lib_libxtrans
1
0
Fork 0
mirror of https://github.com/SwallowOS/xorg_lib_libxtrans synced 2025-12-27 20:11:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

libxtrans: fix linux compilation breakage

Browse Source 
* Xtranssock.c:
          (SocketReopen): protect use of BSD4.4 socket with BSD44SOCKETS macro.
          protect use of strlcnpy with HAVE_STRLCPY macro.
          That one is defined (or not) by the xserver configure.
This commit is contained in:
Dodji Seketeli
2007-09-11 08:48:03 +02:00
parent 6217f34977
commit 88e1412251
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Xtranssock.c
View File

@@ -172,6 +172,7 @@ static int IBMsockInit = 0;
#ifndef BACKLOG
#define BACKLOG MIN_BACKLOG
#endif
/*
* This is the Socket implementation of the X Transport service layer
*
@@ -540,12 +541,18 @@ TRANS(SocketReopen) (int i, int type, int fd, char *port)
}
portlen = strlen(port);
#ifdef BSD44SOCKETS
if (portlen < 0 || portlen > (SOCK_MAXADDRLEN + 2)) {
PRMSG (1, "SocketReopen: invalid portlen %d\n", portlen, 0, 0);
return NULL;
}
if (portlen < 14) portlen = 14;
#else
if (portlen < 0 || portlen > 14) {
PRMSG (1, "SocketReopen: invalid portlen %d\n", portlen, 0, 0);
return NULL;
}
#endif /*BSD44SOCKETS*/
if ((ciptr = (XtransConnInfo) xcalloc (
1, sizeof(struct _XtransConnInfo))) == NULL)
@@ -571,9 +578,15 @@ TRANS(SocketReopen) (int i, int type, int fd, char *port)
/* Initialize ciptr structure as if it were a normally-opened unix socket */
ciptr->flags = TRANS_LOCAL;
#ifdef BSD44SOCKETS
addr->sa_len = portlen + 1;
#endif
addr->sa_family = AF_UNIX;
#ifdef HAVE_STRLCPY
strlcpy(addr->sa_data, port, portlen);
#else
strncpy(addr->sa_data, port, portlen);
#endif
ciptr->family = AF_UNIX;
memcpy(ciptr->peeraddr, ciptr->addr, sizeof(struct sockaddr));
ciptr->port = rindex(addr->sa_data, ':');